merge trunk
authorK. Handa <handa@gnu.org>
Wed, 12 Jun 2013 14:26:04 +0000 (23:26 +0900)
committerK. Handa <handa@gnu.org>
Wed, 12 Jun 2013 14:26:04 +0000 (23:26 +0900)
commit7fbb20afad973ee2e54fb1c9a2ec779c75000d75
tree2896776a3a48c57c441dba123535f05b90b0c01a
parent15982454a8e5a907892f9c8cf3653edcc848c349
parentab2005367dc353b9c1514fb1a2f4e270e3699c90
merge trunk